Merge "Fix a bug where the legacy extra info is reset on connect."
tree: cebfdf174938161515f4a0afc98dbba0f9bbda24
  1. core/
  2. services/
  3. tests/