Merge pull request #20454 from thaJeztah/docs-cherry-picks

Docs cherry picks