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