Closes #18939: Merged documentation update from 3.3.