Backport of #8853 for release 12.0#8937

systay merged 1 commit intovitessio:release-12.0vitessio/vitess:release-12.0from

planetscale:jg_8853_backportplanetscale/vitess:jg_8853_backportCopy head branch name to clipboard