Issue #24952: Merge 3.4 into 3.5