Merge "Unique field moved to vnf policy"