some more changes from upstream

What does this PR do?

your weekly bunch of updates from upstream! remember that I'm trialing this future branch, into which I'll merge upstream changes relatively often, so we can review them in smaller chunks without risking our develop branch.

see also !465 (closed)

Contribution Guidelines By submitting this merge request, you agree to follow our Contribution Guidelines

• I agree to follow this project's Contribution Guidelines
• I have made sure to test this pull request (pnpm --filter=backend test passes, pnpm --filter=frontend test fails the same as on develop)