Merge multinic feature into XNI branch