follow changes in Rec!2653

Gerhard Ravenrequested to merge
issue-rec-223 into master

Follow changes in Rec!2653 (merged)

must be applied in conjunction with Rec!2653 (merged) and LHCb!3359 (merged)

Edited by Gerhard Raven

Merge request reports