follow changes in LHCb!3177

Gerhard Ravenrequested to merge
follow-lhcb-3177 into master

required changes for LHCb!3177 (merged) -- must be applied in conjunction with LHCb!3177 (merged)

Merge request reports