Sync with new client
Merge pull request #758 from xschildw/SYNC-PLFM-2442

Sync with new client