Changes to the db2 lib
Merge changes