Merge branch 'wireguard-patches-for-6-0-rc6'