Did the order environments are applied change in Build Forge 8.0?

We're working on upgrading Build Forge from 7.1.3.4 to 8.0.0.0. We have project environment variables set that use environment variables set in the server environment. In 7.1.3.4 this seems to work, but in 8.0.0.0 it looks like the server environments are applied after the project environments. I'm looking at the log file and I can see the SET for the server environments applied first in 7.1.3.4, but in 8.0.0.0 it looks like the server environment is second. And because the server environment comes second we see a lot of "Reference to undefined variable:" when trying to apply a project environment that uses something from the server.