unwanted rate change
Merge branch 'fix_csg_and_report_sum' into 7.0