Merge branch 'vrf-inetpeer'