Do not merge!

Test PR to verify Harish's new vgw code