Release 1.21(for DB2)

- Based on Revert "Release 1.16 (only for DB2)"
- Removed debugging messages