Adapt to LHCb!3067

The title pretty much says it all.

Current diff is a bit larger because this already includes the changes in !2443 (merged) to avoid conflicts with that MR.
The actual changes of this MR are all in the last commit.

Merge request reports

Loading