Issue #23738: Merge 3.4 into 3.5