The registry used by addons should be the registry they were created for
Merge branch 'master' of github.com:forge/furnace into FORGE-988