Merge "GenericSource: Synchronize access to dataSource"