Incorporate updates to go code