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