Catalogue Report update backport changes.

This update includes the backport for the catalogue report changes that is in backport release 1.0.12 and 1.0.13.