https://github.com/flyteorg/flyte/pull/5590 for core Flyte - hopefully that runs through CI without much trouble