Issue #26304: Merge doc wording from 3.5