Merge branch 'hotfix/1.1c'
Merge branch 'release/1.2'