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