Co-authored-by: Rémi Verschelde <rverschelde@gmail.com> (cherry picked from commit 1ddb0e56ac)
1ddb0e56ac