Merged latest head into jdbc-driver branch