Add client options. (#8265)

2 files changed