Merge with upstream branch from. Two broken tests, both having to do with array vs object in json representation