Doc fixes related to #9523
Merge pull request #9591 from BBosman/9523

Doc fixes related to #9523