Finished the work on the generic report for bug #8378.