Merge branch 'feature/addon-manager'