Merge branch 'release-4.0' into release-4.1