commit merge mehdi & jb