Merge VPN GUI changes