Merge pull request #23824 from JiaY-shi/go