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