Merge branch 'release/release-1.0'
Merge branch 'master' into develop1