Merge branch 'json-support'