JBTM-1343 Updated to break the dependency on the internal repo for driver