Merge branch 'ew-dev'
Now, multiple sensors may have the same name.