Merge pull request from learneda/dependency-maintenance Dependency maintenance