Issue #25004: Merge 3.5 into 3.6