Modify json_leaf to handle numerical & boolean data properly
Resolve conflict
Bug fix