Merge pull request #901 from jkczyz/2021-04-invoice-feature-semantics