Add report total to report results.
Fix merge conflicts.
Merge branch '1018_report_api' into develop