Merge branch 'develop' into camara-demo-integration