Merge branch 'release/2.1.0' into develop
update auto get config on register
update version number
Merge branch 'release/2.1.1'