Merge branch 'refactor/dependencies' into develop

1 job for develop