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

[Updated] SSDataSources