Merge branch 'release-3.30' into release-3.31