Don't do manual invoicing since it isn't needed for subscriptions
Merge branch 'fix-invoicing' into oyster-fork