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