-- #hr-130 handled upgrade for org_id