Merge "Prototype color changing support"