Includes designation to remove N+1 queries
Merge branch 'master' into import_cites_suspensions