8.0 mods and expenses

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

Merge request reports