Merge pull request #21827 from jefferyto/golang-1.21.0