Merge "Adding doctor driver and datasource"