Merge branch 'release-3.24' into release-3.25