sync v2.10.x with main

Maximilian Fußrequested to merge
m.fuss/web-app:backport-missing-commits into release/v2.10.x

Merge request reports