changes made for WF-1666

changes made for WF-1666