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