Merge branch 'release-1.1'
Merge branch 'release-1.2'
test hotfix
Merge branch 'hotfix-1.2.1' into develop