Updated handling of push to minimize the number of exchange connections.