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