added a failover for driver name
Merge branch 'dev' of barnabas.kellpro.net:kts into dev