Rebuild drivers
Merge branch 'develop/6' into develop/7
Rebuild JDBC drivers