Merge "Fix supplimentary network connections with VPNs"