Finish and improvements to accounting

Merged Sebastian Kennedy requested to merge 8.0-continue-safekeeping into 8.0-stage

Merge request reports