Merge branch 'sensor-fix-rebased' into 'master'

Sensor logic fix.

See merge request !64
23 jobs for master in 1 minute and 25 seconds (queued for 1 second)