Merge "Fix ColorMatrix performance and correctness issues." into klp-dev