@xiangli-cmu What do you think about https://github.com/coreos/etcd/pull/484?