slack-15.0
: backport vitessio/vitess#15772
#384
Merged
slack-15.0
: backport vitessio/vitess#15772
#384