dd2bec5904
(cherry picked from commit 9e3a01a1be)
Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>