Merge "Add ids to credential entries"