Issue #28918: Merge 3.6.