Merge branch 'hotfix/v.1.0a'
Merge branch 'hotfix/v.1.0b' into develop