Added archive flag, no longer delete records.
Diff now persisting for all objects.
Merge branch 'matt-integration'