Issue #29145: Merge 3.6.