Update multimodel_support

[arne-vdb]

• [x] This comment contains a description of changes (with reason)
• [ ] Referenced issue is linked
• [ ] If you've fixed a bug or added code that should be tested, add tests!
• [ ] Documentation in docs is updated

Description of changes

Update multimodel support with newest fixes