Merge branch 'dep-refactor'