Merge branch 'release-3.31'