Cleanup dependencies.
Merge branch 'hotfix' into develop