CMR - fixes in the report printing version
code refactoring
Merge pull request #4922 from lwyszomi/opm-images

CMR - fixes in the report printing version