Merge branch 'release/1.0' into develop
bug1
Merge branch 'release/1.1'