Issue #25022: Merge with 3.4