Upgrade dependencies
Merge branch 'dependencies' into develop