Temporarily include the changes from gaudi/Gaudi!1465 (merged) until it is merged and tagged.
See also lhcb-core/LHCbNightlyConf!1025 (merged)