chore(client/v2): sync client/v2 with main (backport #22493, #22817)

chore(client/v2): sync client/v2 with main (backport #22493, #22817) #41763