Closes #21608: Merged documentation update from 3.4.