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