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