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

[Updated] SSDataSources