Registration changes.
Merge