Merge "Fix EVS Stream definition"