Merge branch 'release/1.0' into 'develop'