Issue #25494: Merge with 3.4