[master] + minor fixes
[master] + fix connection-pool