Manual cherry-pick of 13339#13733

deepthi merged 3 commits intovitessio:release-16.0vitessio/vitess:release-16.0from

planetscale:backport-13339planetscale/vitess:backport-13339Copy head branch name to clipboard