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