[v24.05-stable] Backports from master

Merge request reports

Loading