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