[db-api:citizen] - Fix null citizen on lookup
Release 0.8.4
Merge branch 'release-0.8.4' into development