Merge "Add N2VC support"