This is a continuation of f7c0ef1f73. Pull Request: https://projects.blender.org/blender/blender/pulls/110987
f7c0ef1f73