MIFOSX-1662 Fix for Client Withdrawal issue.
Merge pull request #1175 from chandrikamohith/1662

MIFOSX-1662 Fix for Client Withdrawal issue.