Merge branch 'release-3.29'