Merge branch 'release-4.0'