Closes #23305: Merged documentation fix from 3.4.