Merge branch 'ivory_13_16_acu123856_fix_json_serialization' into teal_13_15_acu125100_support_mingw