(cherry picked from commit 7a14f6c595)
7a14f6c595
Co-authored-by: Francisco Giordano <frangio.1@gmail.com> Co-authored-by: Hadrien Croubois <hadrien@openzeppelin.com>