8.0 expense changes

Merged Reviewer Intergaláctico requested to merge 8.0-Expense_Changes into 8.0-stage

Merge request reports