Merge "Enable EVS service"