Merge "GenericSource2: fix data source reset/init"