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