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

[Updated] SSDataSources