[7.x.x] Fix some small dependency issues#54

adamretter merged 5 commits into

develop-7.x.xevolvedbinary/elemental:develop-7.x.xfrom

7.x.x/hotfix/dependenciesevolvedbinary/elemental:7.x.x/hotfix/dependenciesCopy head branch name to clipboard