Merge branch 'hotfix/1.2'
Fix typo
Merge branch 'hotfix/1.2.1' into develop