Merge branch 'release-1.4.1'