This supercedes !730 (closed) as things got messy with !685 (merged) being merged.
All issues were resolved before closing and implemented in this MR
Needs LHCb!2927 (merged)
This supercedes !730 (closed) as things got messy with !685 (merged) being merged.
All issues were resolved before closing and implemented in this MR
Needs LHCb!2927 (merged)