Merge change 20621

* changes:
  Delete rows that are unused when changes are synced down