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