Access Control: "repair" JSON (migration 1)
Merge branch 'master' into workspace-acl