Merge pull request #2548 from castillofrancodamian/vpn