Follow changes in LHCb!3917

Gerhard Ravenrequested to merge
follow-LHCb!3917 into master

should be merged concurrently with LHCb!3917 (merged)

Edited by Gerhard Raven

Merge request reports