2010-2Q: CORE: Additional VLAN support