Issue #29092: Merge 3.6.