Merge "Create first class unbounded ColorOp" into nyc-dev