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