Merge branch 'release-4.1' into release-4.2