Merge "Moving color extraction classes" into oc-dr1-dev