Merge branch 'vrf-looping'