[59] Fix dependency issues
Merge branch 'task-59-fix_dependencies' into develop
Merge branch 'develop'