Should be first commit in Fulvio's (fgal) branch.