Merge branch 'hotfix/1.2.1'
Fix setting assignment
Merge branch 'hotfix/1.2.2' into develop