Issue #29009: Merge 3.6.