Merge from vezzi