cherry pick rgb values commit