Pick up change to scm-api