Merge "Added support for vlan mode."