Pull request to upstream

Thank you Giuseppe.