Issue #24984: Merge 3.4 into 3.5