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