(cherry picked from commit b9125001f0)
b9125001f0
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>