Issue #25097: Merge with 3.4