Merge branch 'hotfix/4.1.1'