Merge "Fixes in JSONStrategy"