Updates mainly for Go environment
Merge