Merge "Float color matrix fixes" into klp-dev