Adding global_category_id see BT#6636
Adding work/document DB changes see BT#6614