1 step hotfix-1.2.1
Merge branch 'hotfix-1.2.1' into develop