Merge "adding catalog-service for mod2"