Merge pull request #35894 from github/repo-sync

Merge pull request #35894 from github/repo-sync #9095