hotfix 4.1.1
Merge branch 'hotfix/4.1.1'