Merge pull request #7942 from ausbin/comcarcoff-json-fix