Issue #2344235: add a catalog