16 Commits (fix/remove-env-var)