Cherry-pick of "Merge branch 'EnvGenerationFix-1.0-20171101' into '1.0'" into master
Environment Generation Fix, 1.0 branch (2017.11.01.)
See merge request !160 (merged)
Environment Generation Fix, 1.0 branch (2017.11.01.)
See merge request !160 (merged)