Issue #28662: Merge 3.6