Merge pull request #20781 from thaJeztah/docs-cherry-picks-2

Docs cherry picks 2