Merge pull request #20984 from github/rc/3.20

Merge pull request #20984 from github/rc/3.20 #34575