Merge pull request #2727 from TheBlueMatt/2023-11-better-bolt11-utils