Merge branch 'release-3.25' into release-3.26