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