Issue #12005: merge doc patch from 3.2