Docs for issue #22570. (Merge 3.4->3.5)