Neutron vswitch

Re added the modifications based on the latest master