changes made for WF-1666