Merge "Add the vnf changes"