Merge branch 'vrf-pktinfo'