Merge pull request #20693 from jefferyto/golang-1.20.2