Implement actual permissions
Merge remote-tracking branch 'origin/issue449'