Router: Pass the same `env` variable down
Merge pull request #1651 from judofyr/router-keep-env

Router: Pass the same `env` variable down