Merge pull request #1985 from Kurtsley/chore-no-std-phantom-invoice