cd1972f4cd
Supersedes #6861
Co-authored-by: Pierre-Monier <65488471+Pierre-Monier@users.noreply.github.com>
Co-authored-by: Pierre-Monier <65488471+Pierre-Monier@users.noreply.github.com>
(cherry picked from commit 4560033e66)