Merge branch 'release/release-1.0' into develop
commited changes
Merge branch 'release/1.1'