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