json encoding error
Merge branch 'hotfix/v0.61'