fix setting json convertion
Merge branch 'fix-json' into develop
Merge branch 'develop'