Merge "K-Means color clustering" into oc-dr1-dev