Signed-off-by: Julien Malik <julien.malik@paraiso.me> (cherry picked from commit 69655222fc)
69655222fc