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