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