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