Merge branch 'hotfix/v1.2.1' into develop