Issue #28971: Merge 3.5