Merge branch 'periodic-invoices-order-value-basis'