Merge fix for camera view.