Merge "Hide all color hints references" into oc-dr1-dev