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