Merge branch 'better-json-fix' into json-fix-extended