Closes #18434: Merged documentation update from 3.3.