Rebuild to include etcd reconnection support