Merge_GAUTHIER/CHAMBONNET