Issue #17007: Made minor changes to documentation wording.
Issue #17007: Merged minor changes from 3.2.
Issue #17007: Merged minor changes from 3.3.