8.0 improve unpaid

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

Merge request reports