Update json
Merge branch 'master' into fix/crash-when-scrolling