Issue #25508: Merged documentation fix from 3.4.