Closes #18433: Merged documentation update from 3.3.