Closes #8076
(cherry picked from commit 2c1b60aec7e7fbeb4d0f0007c1933ad1572af490)
Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>