Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com> (cherry picked from commit aa4b901788)
aa4b901788