Backport 1.8 doc fixes

Backport  1.8 document fixes for

gh-3563
gh-2354
gh-2807
gh-2423