Merge "Add color space connection"