Backporting commit 31c986998b to 3.6 release branch
Pull Request: https://projects.blender.org/blender/blender/pulls/109147
Backporting commit 31c986998b to 3.6 release branch
Pull Request: https://projects.blender.org/blender/blender/pulls/109147