Code

Branch: issue872-json-corpus-fixes