WF-1660& WF-1661 Resolved