Merge "Frameworks/base: Fix registration function" into nyc-dev