Merge "switch default values for ves to env"