PR Review: fix(client) #38411