Issue #28762: Merge 3.6.