Refactored and updated CRS reports.
Merge pull request #3394 from lwyszomi/CRS-report-update

Refactored and updated CRS reports.