using new client
merged conflicts
Merge pull request #757 from john-hill/SWC-1113-web

using new client