(cherry picked from commit 4546d5445a) Co-authored-by: Pierre Sassoulas <pierre.sassoulas@gmail.com>
4546d5445a