[Updated] SSDataSources
Merge pull request #8176 from jhersh/master

[Updated] SSDataSources