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