Merge pull request #538 (technical: #545) from MaMpf-HD/main

This is just to bring back a merge commit from `main` to `mampf-next`.
Will try to do a rebase from `mampf-next` onto `main` next time to avoid
these kind of PRs and merge commits.