Merge pull request #5816 from jow-/wireguard-rewrite