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