Merge "Support disconnecting while trying to connect."
tree: 4b588d8b834c8eaca572fce548c21484ed898f1e
  1. core/
  2. services/
  3. tests/