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