WIP: integrate patch to return db connections to poll