Merge pull request #22844 from anupamvs/crm-reports

refactor: Crm reports cleanup