Merge pull request #20661 from jefferyto/golang-1.19.7