scm-issue-23