Merge branch 'release-1.2'
Version 1.2.1 hotfix
Merge branch 'hotfix-1.2.1' into develop