Merge "Add support for cba enrich, publish, draft, remove"