Merge branch 'avoid-json-parsing-of-null'