Merge "New headers for camera"