Merge "[MODELING] Refactor Modeling environment variables"