Issue #23406: Merge 3.4 into 3.5