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