Merge branch 'jsonchan' into master-old