Merge pull request #23318 from thaJeztah/20160606-docs-cherry-picks

20160606 docs cherry picks