re #842 - Keep officers ID temporary
Merge branch 'feature/842-districts' into staging