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