Maybe we need an “rc-cherrypick” label that we remove once the change is in an rc