Merge pull request #1760 from TheBlueMatt/2022-10-invoice-builder-round