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