Issue #25004: Merge 3.4 into 3.5