Merge pull request #1331 from TheBlueMatt/2022-02-no-copy-invoice-fields