latest merge + gofmt