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