Merge pull request #5276 from xkqian/add_hello_retry_request

Add hello retry request in client side