Merge "Improve DataSource interface."