Issue #21439: Merge with 3.4