Artifacts of scm-support #2007