Merge branch 'hotfix/hotfix'
Merge branch 'release/v1.0'