Pull request with the latest json code update.