Merge "Refactor off V2 Cow Ops" into main