backport https://github.com/etcd-io/etcd/pull/12709 and https://githu…

backport https://github.com/etcd-io/etcd/pull/12709 and https://githu… #370