Merge "Fixes networking related constraints for Virtual deployments"