[CR/IM] Review VLAN - infrastructure linking and improve and extend