client. Contributed by Jian He (cherry picked from commit 890a2ebd1af51d24ccbbc5d1d65d17b24ad8ab9b) (cherry picked from commit be3322792f8961eb3e1bec7a0119a4bf092543ee)
client. Contributed by Jian He (cherry picked from commit 890a2ebd1af51d24ccbbc5d1d65d17b24ad8ab9b) (cherry picked from commit be3322792f8961eb3e1bec7a0119a4bf092543ee)