Changed default pub_cat_aggregate_id
merged conflicts