Merge branch 'develop' into 'master'

Develop
doc adds
Merge remote-tracking branch 'origin/develop'
dev
pop id from main sensor dict
Merge remote-tracking branch 'origin/develop' into develop