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