Resolved conflicting dependencies
Merge branch 'hotfix/missing_public_dependencies' into develop