Just sensors 18 and 22.
Merge branch 'master' into deploy_client