Merge branch 'feature/9112_multiple_catalog_support' into develop