Integrate latest changes in `main` into `develop`

[sbfnk]

main and develop have diverged - develop doesn't have the changes from version 1.2.2. At some point we need to either merge or rebase.

[nikosbosse]

Closed via #556