Merge "Add entity uri field to Eab provider"