Merge "Allow to override the  datasource name"