Closes #5705
(cherry picked from commit c90a3e02568368f55f454aee7c89ed57a945ed17)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>