Use common JSON module
Drop json-functions-xs dependency
auto-merge staging into master