Merge branch 'dev_cam' into dev-cam-nv