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