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