Merge remote-tracking branch 'origin/8660-camera' into HEAD