Merge pull request #1661 from HellBrick/connection-group-deadlock