bring SCheck upstream