Merge "Add Grayscale conditional"