Both sensors can not ask for data at the same time.
Merge branch 'master' into deploy_client