Merge branch 'hotfix-1.4.1'