Merge "Add configurable mapping between color modes"