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