*: sync recent cleanups
packet: VLAN support