Merge branch 'feature/better_module_dependencies' into develop