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