[PATCH 0/1 conductor] Fixes CatalogEntry migration