Fixed issues in unit-tests due to device table column change.
Merge remote-tracking branch 'origin/develop' into develop