(cherry picked from commit 2985b7fe1755b8bc3b3e7c01cb1bc4f92b770791)
Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>