Restore the json format
Merge branch 'lee' into develop