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

[Updated] SSDataSources