Issue #26941: Merge 3.6.