8.0 fixes invoicing

Merged Sebastian Kennedy requested to merge 8.0-fixes_invoicing into 8.0-stage

Merge request reports