Merge "oom environment file with added timeouts"