Merge "Use providers between Go module types" into main