Issue #25827: Merge with 3.5