Merge branch 'vlan-reorder'