[Andys]

Looks like fixes for golangci-lint just got merged and should be in the next release:

https://github.com/golangci/golangci-lint/pull/2991