Merge branch 'json-api-v0.6' into v0.6