Merge branch 'vlan_features'