Issue #17007: Merged doc update from 3.2.