Merge fix
Merge fix
Use fastjson instead of flexjson (improve perf)