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

[Updated] SSDataSources