GCP-5515 Add Env Condition