Merge branch main into develop

Previously, the `develop` branch had diverged from `main`.

This commit merges the latest changes from `main` into `develop` to
bring it up to date.

Author: moritzsommer