Merge "Remove color format constraints"