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