slack-19.0: backport finalized version of v22 PR vitessio/vitess#17815#616

timvaillancourt merged 1 commit intoslack-19.0slackhq/vitess:slack-19.0from

bp-pr17815.slack-19.0slackhq/vitess:bp-pr17815.slack-19.0Copy head branch name to clipboard