CON-548: Added city_id to primary key