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