Merge branch 'hotfix/hotfix1'
Merge branch 'hotfix/1.1' into develop