Issue #25010: Merge with 3.4