[570995] Use local EnvironmentFactory effectively
80 files changed