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