Merge pull request #1104 from TheBlueMatt/2021-10-payment-id-in-monitors