Merge branch 'release-4.2' into release-4.3