fix json compile
json compile warning
Merge branch 'dev'