Merge "Fix sonar job after Go version uplift"