Co-authored-by: Francisco Giordano <fg@frang.io> (cherry picked from commit a754936a47)
a754936a47
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>