Merge "Add JsonUtil and use it"