* commit '3bc3240ffb51358fa706099cfc5e120cf0f1b60d': Use hostname verifier directly instead of instance