WF-1660 & WF-1661 is Resolved
WF-1595 - Fixed, Enhanced code for better processing