Fixing catalogs for upstream
Merge pull request #749 from psav/fix_catalog_upstream

Fixing catalogs for upstream