Merge pull request #23475 from mcha-forks/go-1.22