Merge branch 'release-3.28' into release-3.29