Merge "Update extra info before registering"
tree: 3d5457b2d9bbdd2221a6bd5932253e76f1ce4cf8
  1. core/
  2. services/
  3. tests/