slack-19.0: backport vitessio/vitess#18234
#659
Merged
slack-19.0: backport vitessio/vitess#18234
#659