This merge request is needed on the LHCb side when we use the DD4hep geometry framework and does not harm otherwise in the head of master.
The key questions are :