slack 19.0: pre backport vitessio/vitess#18152
#638
Merged
slack 19.0: pre backport vitessio/vitess#18152
#638