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