#482 better test
Merge branch 'master' into 482
#482 env with DockerRun