Fix sensors/devices refactor last bug
Merge branch 'master' into dev/github-webhooks