* commit 'a6226a2d202619ddb7e3e9765a3dc9f20241f853': Use hostname verifier directly instead of instance