Merge pull request #948 from TheBlueMatt/2021-06-p2p-fixes