0a19748 Merge branch 'hotfix/v1.1.1'