Merge pull request #1479 from ViktorTigerstrom/2022-05-pass-counterparty-id-to-functions