Merge branch 'hotfix/4.11.1'