(cherry picked from commit 0301c9bd ) Co-authored-by: Stefano Taschini <taschini@users.noreply.github.com>