This contain the fix for go 1.16 that we backported, so we can use upstream repository again
Attach a file by drag & drop or click to upload
