Fixed bug with null vlans.
Merge branch 'test' into dev