Issue #28538: Merge 3.6.