Merged registry code into master