Remove EnvironmentConstants from versioning
Merge branch 'master' into cascade