Goes with lhcb/Moore!2338 (merged) and all the other related MRs in other projects, see Moore MR for more info.