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