fix dependencies troubles
Merge branch 'develop'