Modified for WVR, vnext issues with Firewall