Readded "NOT NULL" conditions to the device fields.
Merge branch 'master' of /srv/GITROOT/Tardis