Merge "Patch to enforce json extension works in existing API behaviour"