Merge "Fix reference to ProxyInfo extra"
tree: 9ede1428df33581fc52af2fd57d92d491b33fb84
  1. core/
  2. services/
  3. tests/