Merge pull request #4881 from ace20022/json_fix