Merge "color matrix bugs" into klp-dev