Merge branch 'release-3.31' into release-4.0