Merge "Misc improvements in GO code"