Merge branch 'hotfix/1.2.1' into develop
hotfix
Merge branch 'release/1.2.2'