Add support for client reports.
Merge branch 'client-report' into develop