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