Signed-off-by: Arthur Gautier <baloo@superbaloo.net> (cherry picked from commit fd2e675e7c5205c0c6e3bcdad7f10a2db8fe25d0)