Merge branch 'connection-pool-fix'