follow changes in LHCb!2969

Merged Gerhard Raven requested to merge follow-lhcb!2969 into master

changes required for LHCb!2969 (merged)

Merge request reports