Merging Inria's modifications