Wip 366 upgrade java driver