Merge "BUG-1621 Fix reconnecting."