rebase and refactor

3 jobs for vlan-support in 45 seconds (queued for 6 seconds)
latest