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