Fix dependencies
Merge branch 'deps' into develop