Merge "color blindness enhancement" into klp-dev