Merge pull request #3470 from nabinhait/develop

Performance upgrade in reports and indexing