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