re #842 - Sync attachments and activities with new primary keys
Merge branch 'feature/842-districts' into staging