Merge "Move implementations to DataSourceBase.h"