Apply go fix to codebase
#7831
+494
−582
Merged
go fix to codebase
#7831
go fix to codebase
#7831