Merge branch 'ls/sensors'