Merge branch 'release/v0.1.2'
Merge branch 'release/v0.1.2.aaa'
Update bugfixed client from the latest client develop rev