changes required for gaudi/Gaudi!1249
Changes to make code forward compatible with gaudi/Gaudi!1249 (merged). Can be applied independent of gaudi/Gaudi!1249 (merged)
Edited by Gerhard Raven
Changes to make code forward compatible with gaudi/Gaudi!1249 (merged). Can be applied independent of gaudi/Gaudi!1249 (merged)