Merge CM

Camera fix