Add some needed manual dependencies.
Merge branch 'develop'