Merge "Update extra info before registering" into rvc-dev