Merge pull request #2061 from Ansuel/improveconn