Merge branch 'master' into ls/sensors