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