[merge] Preparations for color functionality