fix: nondefault model version

[racinmat]

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:

• Make sure to open an issue as a bug/issue before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea
• Ensure the tests and linter pass
• Code coverage does not decrease (if any source code was changed)
• Appropriate docs were updated (if necessary)
• Get the necessary approvals
• Once the last commit on the PR has been approved, add the "ready to pull" label to the Pull Request

Note: do not merge your PR from GitHub. Adding the "ready to pull" label is the final step in the review process.
After approvals, the changes in your PR will be committed to the main branch and this PR will be closed.

Fixes #2619 🦕

Supercedes #2786

[racinmat]

@BenjaminKazemi please could you post here what's the issue and the logs of the failed tests? Thanks.

[BenjaminKazemi]

Hi @racinmat, thanks for your contribution. Could you please resolve the merge conflict and do a rebase? Thanks!