PR: fix(client) #38464