Follows Detector!418 and related

Fix failing LHCb test after merge of Detector!528 (merged)

Goes with Detector!418 (merged), Rec!3519 (merged) DaVinci!1017 (merged)

cc @clemenci @tfulghes