Merge branch 'refactor-package-manager'