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