Merge "Add some v3 notes" into feature/zuulv3