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