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