Merge "DataSourceDesc: refactor to base class and subclasses"