[main] And camera.
Merge branch 'camera'