Merge branch 'ionic-vlanid-mgmt'