[6.x.x] Fix some small dependency issues#50

adamretter merged 3 commits into

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

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