Merge branch 'master' into ew-dev
New sensor channel key.
Merge branch 'ew-dev'