Merge "Fix API feedback on Color" into oc-dev