Merge "Create network/subnet refer to the new datamodel"