More fixes to permissions-related stuff.
Merge remote-tracking branch 'origin/development' into development