Merge change 20660

* changes:
  add the deleted flag to the Groups table