Issue #26940: Merge 3.6.