Merge branch 'jc/report-tracking'