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