Merge "Fix vlan leak"