Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 36f2e08fd3)
36f2e08fd3