Merge pull request #9373 from nupplaphil/task/server_env