Make generated code compatible to be used both with and without gaudi/Gaudi!1297 (merged) so that gaudi/Gaudi!1297 (merged) can be merged.