Closes #12718: Merge documentation fix from 3.2.