fix(client/v2): correctly handle enhanced sub commands (#21809)

fix(client/v2): correctly handle enhanced sub commands (#21809) #6334