Merge v2.10.x into main

[schlunma]

Description

Merge v2.10.x into main to get versioning correctly.

Note that this also includes #3473

Checklist

It is the responsibility of the author to make sure the pull request is ready to review. The icons indicate whether the item will be subject to the 🛠 Technical or 🧪 Scientific review.

• [x] 🛠 This pull request has a descriptive title
• [x] 🛠 Code is written according to the code quality guidelines
• [x] 🛠 Documentation is available
• [x] 🛠 Tests run successfully
• [x] 🛠 The list of authors is up to date
• [x] 🛠 All checks below this pull request were successful

---

To help with the number of pull requests:

• 🙏 We kindly ask you to review two other open pull requests in this repository

[schlunma]

I think this can be merged.