Merge "VLAN bug fixes"