do not use parameters for environments
Merge remote-tracking branch 'upstream/master'