Merge branch 'release/v1.0'
Merge branch 'hotfix/hotfix1.0' into develop