Merge "Remove color and appearance" into nyc-dev