Merge "use defaults for scm"