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