fix report
Merge branch 'report-new-feature' into develop