Issue #25093: Merge with 3.4