more dependency issues
Merge branch 'hotfix/dependency_issues'