changes required for LHCb!2959

Merged Gerhard Raven requested to merge follow-lhcb-2659 into master

Merge request reports