Filter server based on environment

Merged Santiago Said requested to merge FilterServerBasedOnEnvironment into 10.0-stage

Merge request reports