Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
(cherry picked from commit b07cf8663e4af7b88856caf11d1cd2d1a4384c4a)