BL-381: Catalog patches