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