Merge branch 'release-3.26'