Merged with new jdbc driver

Merged with new jdbc driver