Merge branch 'hotfix/1.2' into develop
fix typos
Merge branch 'release/1.2.1'