merge json_numeric to master