vezzi development w/merge resolution from mariogiov

I think we can remove it