resolve dependencies
Merge branch 'hotfix/dependency_resolution'