Merge "Set bolt and plus colors together" into oc-dr1-dev