scm-issue-22