Merge "VLAN support for external networks"