Merge pull request #3452 from castillofrancodamian/vpn