Merge branch '1660_color_keywords'