Issue #28248: Merge with 3.6