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