Backport #16129 and #16159 to v16#110

arthurschreiber merged 2 commits intorelease-16.0-githubgithub/vitess-gh:release-16.0-githubfrom

backport-16129-16159-to-release-16.0-githubgithub/vitess-gh:backport-16129-16159-to-release-16.0-githubCopy head branch name to clipboard