Merge from Vezzi upstream