Merge "Fixes handling of arrays in XML to JSON conversion"