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