Merge branch 'feat/new-client-options' into 'develop'

feat: new client options

See merge request !1099
4 jobs for develop in 11 minutes and 47 seconds (queued for 14 seconds)