Second CPP client.
Merge branch 'ew-dev'