Issue #24952: Merge 3.5 into 3.6