Merge branch 'jr/json'