Make forward compatible with gaudi/Gaudi!524
See merge request !981 (merged) (cherry picked from commit 3c7c4e49)
Closes LHCBPS-1829
Edited by Marco Cattaneo
See merge request !981 (merged) (cherry picked from commit 3c7c4e49)
Closes LHCBPS-1829