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