Issue #29078: Merge 3.6.