Merge commit 'origin/json-client'