non-good commit of merge multi-server-hack into v1.64