Merge branch 'hotfix/1.1.7'