Merge remote-tracking branch 'origin/1.1.0-wip' into 1.1.0-wip
add getClient/setClient