Merge branch 'hotfix/1.1.3'
Merge branch 'hotfix/1.1.4' into develop