Merge "Set MVN env var for scripts to use"