Issue #24808: Merge 3.5 into 3.6