Fix bug in the API
Merge branch 'api-bug-fix'
Merge branch 'master' into new-acl-system