Merge branch 'origin/release-4.0'