Merge "BUG-432: migrate users of Registration as appropriate"