Merge pull request #5008 from mpratt14/vlan-default