Merge branch 'dsa-core-vlan'