Merge "Allow Cow version v3 to be used" into main