Merge "Add aggregate json client and tests."