Follows LHCb#256 (closed)
Goes with LHCb!3779 (merged) Rec!3122 (merged) Allen!1000 (merged) Panoramix!122 (merged)