Fixed dependeny issues
Merge branch 'master' into functional-tests