Merge branch 'release-4.0' into pr/4.0-migration-guide

Merge branch 'release-4.0' into pr/4.0-migration-guide #2943