[Updated] SSDataSources
Merge pull request #5700 from jhersh/m.ssdatasources

[Updated] SSDataSources