the whole set of changes that has to do with the merging of catalog and container connector.