Bug fix in Sensor model.
Merge branch 'ew-dev'