Merge branch 'libs/json/local'