Merge remote-tracking branch 'origin/json-support'