Merge pull request #4948 from ldir-EDB0/remwireguard