Merge documentation for issue #27030 from 3.6.