Gateway-3437:Universal Client Cleaning Page2
Merge pull request #380 from alameluchidambaram/Gateway-3437

Gateway-3437:Universal Client Cleaning Page2