Thanks Robert Rioux for the suggestion. Pull Request: https://projects.blender.org/blender/blender/pulls/109187