follow changes in LHCb!3183 (merged)
must be applied in conjunction with LHCb!3183 (merged) and Rec!2510 (merged)