Merge branch 'dependency-types' into transitive-dependencies