dd6ef37be9
This PR combines9d3b2b51a7,30dbb7820d,64198971eaandbaf9691959in main branch and fixes conflicts. Co-authored-by: Aras Pranckevicius <aras@nesnausk.org> Co-authored-by: Sergey Sharybin <sergey@blender.org> Pull Request: https://projects.blender.org/blender/blender/pulls/141236