Issue #24962: Merge 3.4