json fix for issue

Merge branch 'release/v0.6.8'