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