Merge branch 'feature/use-composer-for-dependencies'