Issue #22284: Merge 3.4