bring in more connection-related changes from Tracks