Merge "Update extra info before registering" into rvc-dev
tree: 316ec8c040f3acc54dbf3b3bea130ec7b54186b8
  1. core/
  2. services/
  3. tests/