Merge branch 'release_1.4.1' into 1.4.x