Merge branch 'TheProductWorks-map_support_on_json_parsing'