Cherry-picked from !2018 (merged)
@bcouturi FYI, needed to fix compilation in lhcb-dd4hep build
lhcb-dd4hep build