[1.7.x] Fixed #23169 - Misc docs fixes.

Backport of e4dd8b5dde from master