Merge pull request #1163 from TheBlueMatt/2021-11-support-insecure-counterparty