Merge "Turn CowOperationType into an enum" into main