Merge pull request #2584 from castillofrancodamian/wireguard