Merge "vnr vrf fk issue"