Issue #24984: Merge 3.5 into 3.6