[MOVE-TO PLACEHOLDER for #10926, WS#1]