Issue #24947: Merge 3.4