Merge "Comply with current data model in grant vnf"