Merge branch 'vxlan-rx-cleanups'