WF-1667 Resolved