Merge pull request #1960 from tnull/2023-01-deref-router-in-invoicepayer