Merge branch 'master' into develop
update examples client lib
Merge branch 'develop'