Backport non-connection sharing, close #1119