Merge "Correct Catalog DB beans" into dublin