Merge "Use colorful +s" into oc-mr1-dev