Merge branch 'release-3.26' into release-3.27