#706 addons to apps
#706 core to apps