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