Prerequisites

• I have written a descriptive issue title
• I have searched existing issues to ensure the issue has not already been raised

Issue

The next branch should be synced with main. I wanted to implement some functionality, but the diverging bases makes me believe, that it would result in heavy merge conflicts in the future.

### Tasks