Merge pull request #8486 from neheb/sc