Merge branch 'hotfix/1.1.2'
Merge branch 'develop'