Merge branch 'hotfix/v1.0'
Merge branch 'master' into develop