(cherry picked from commit ae3390dc8dc90eab07ef8fff8218939f01aafb60)
Signed-off-by: Rafaël Carré <rafael.carre@gmail.com>