Merge branch 'feature/refactor_modules' into develop