Merge branch 'feature/auth_module' into develop