Closes #18345: Merged documentation update from 3.3.