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